bitkeeper revision 1.1236.34.9 (4238012bpt6Tbd2QMLJnP0tgbMgzxA)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Wed, 16 Mar 2005 09:49:31 +0000 (09:49 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Wed, 16 Mar 2005 09:49:31 +0000 (09:49 +0000)
Merge

1  2 
linux-2.4.29-xen-sparse/arch/xen/kernel/setup.c
linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c